Test suite cosmetics

Reshuffle things a bit more, sort the test files into subdirectories,
and shorten their names.

diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
deleted file mode 100644 (file)
index 105a06b..0000000
--- a/testsuite/a11y/a11ychildren.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/children --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/a11yderive.test.in b/testsuite/a11y/a11yderive.test.in
deleted file mode 100644 (file)
index 7cb38e3..0000000
--- a/testsuite/a11y/a11yderive.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/derive"
-Type=session
-

diff --git a/testsuite/a11y/a11ymisc.test.in b/testsuite/a11y/a11ymisc.test.in
deleted file mode 100644 (file)
index ef48414..0000000
--- a/testsuite/a11y/a11ymisc.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/misc --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/a11ytests.test.in b/testsuite/a11y/a11ytests.test.in
deleted file mode 100644 (file)
index b67df9d..0000000
--- a/testsuite/a11y/a11ytests.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 GTK_CSD=1 @libexecdir@/installed-tests/gtk-4.0/a11y/accessibility-dump -k --verbose --directory @libexecdir@/installed-tests/gtk-4.0/a11y"
-Type=session
-

diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
deleted file mode 100644 (file)
index dacc009..0000000
--- a/testsuite/a11y/a11ytext.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/text --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
deleted file mode 100644 (file)
index ac62adb..0000000
--- a/testsuite/a11y/a11ytree.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/tree-relationships --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
deleted file mode 100644 (file)
index 92b0bed..0000000
--- a/testsuite/a11y/a11yutil.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/util --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
deleted file mode 100644 (file)
index db4fb9b..0000000
--- a/testsuite/a11y/a11yvalue.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk-4.0/a11y/value --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/a11y/children.test.in b/testsuite/a11y/children.test.in
new file mode 100644 (file)
index 0000000..33085b5
--- /dev/null
+++ b/testsuite/a11y/children.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/children -k --tap
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/derive.test.in b/testsuite/a11y/derive.test.in
new file mode 100644 (file)
index 0000000..6c97ca0
--- /dev/null
+++ b/testsuite/a11y/derive.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/derive -k --tap
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index f4688b985b25540e8c39b86ea6b1b1ad7afd4bb3..8950e6f7904e084eeda54f0cef3bf4496d474f07 100644 (file)
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -11,6 +11,7 @@ a11y_tests = [
 ]
 
 testexecdir = join_paths(installed_test_bindir, 'a11y')
+testdatadir = join_paths(installed_test_datadir, 'a11y')
 
 foreach t: a11y_tests
   test_prefix = 'a11y'
@@ -26,14 +27,14 @@ foreach t: a11y_tests
 endforeach
 
 a11y_installed_tests = [
-  'a11ytests.test',
-  'a11ychildren.test',
-  'a11ytree.test',
-  'a11yvalue.test',
-  'a11yderive.test',
-  'a11ytext.test',
-  'a11yutil.test',
-  'a11ymisc.test',
+  'tests.test',
+  'children.test',
+  'tree.test',
+  'value.test',
+  'derive.test',
+  'text.test',
+  'util.test',
+  'misc.test',
 ]
 
 installed_test_data = [
@@ -122,7 +123,7 @@ if get_option('install-tests')
                    output: t,
                    configuration: test_cdata,
                    install: true,
-                   install_dir: installed_test_datadir)
+                   install_dir: testdatadir)
   endforeach
 
   install_data(installed_test_data, install_dir: testexecdir)

diff --git a/testsuite/a11y/misc.test.in b/testsuite/a11y/misc.test.in
new file mode 100644 (file)
index 0000000..dcfece4
--- /dev/null
+++ b/testsuite/a11y/misc.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/misc -k --tap
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/tests.test.in b/testsuite/a11y/tests.test.in
new file mode 100644 (file)
index 0000000..2787e6f
--- /dev/null
+++ b/testsuite/a11y/tests.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/accessibility-dump --tap -k --verbose --directory @libexecdir@/installed-tests/gtk-4.0/a11y
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/text.test.in b/testsuite/a11y/text.test.in
new file mode 100644 (file)
index 0000000..e2421dc
--- /dev/null
+++ b/testsuite/a11y/text.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/text --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/tree.test.in b/testsuite/a11y/tree.test.in
new file mode 100644 (file)
index 0000000..d093515
--- /dev/null
+++ b/testsuite/a11y/tree.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/tree-relationships --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/util.test.in b/testsuite/a11y/util.test.in
new file mode 100644 (file)
index 0000000..5bab270
--- /dev/null
+++ b/testsuite/a11y/util.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/util --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/a11y/value.test.in b/testsuite/a11y/value.test.in
new file mode 100644 (file)
index 0000000..08f1e31
--- /dev/null
+++ b/testsuite/a11y/value.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/a11y/value --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/css/api.test.in b/testsuite/css/api.test.in
index 3823e9e6bf70967c8e5c1f9096499352f72774ca..ee5a0b38e42f7403dda0239d1c26ac0097dafe62 100644 (file)
--- a/testsuite/css/api.test.in
+++ b/testsuite/css/api.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=@libexecdir@/installed-tests/gtk-4.0/css/api
+Exec=@libexecdir@/installed-tests/gtk-4.0/css/api --tap -k
 Type=session
+Output=TAP

diff --git a/testsuite/css/meson.build b/testsuite/css/meson.build
index de9b12329f53464bfe00e7c721e90c4353ddbdc9..53297089c8bb933cc0b99e9a87ee069f374e266f 100644 (file)
--- a/testsuite/css/meson.build
+++ b/testsuite/css/meson.build
@@ -2,11 +2,17 @@ subdir('parser')
 subdir('nodes')
 subdir('style')
 
+testexecdir = join_paths(installed_test_bindir, 'css')
+testdatadir = join_paths(installed_test_datadir, 'css')
+
 test_api = executable('api', 'api.c',
+                      dependencies: libgtk_dep,
                       install: get_option('install-tests'),
-                      install_dir: join_paths(installed_test_bindir, 'css'),
-                      dependencies: libgtk_dep)
-test('api', test_api, suite: 'css')
+                      install_dir: testexecdir)
+test('api', test_api,
+     args: ['--tap', '-k' ],
+     env: installed_test_env,
+     suite: 'css')
 
 if get_option('install-tests')
   conf = configuration_data()
@@ -14,6 +20,5 @@ if get_option('install-tests')
   configure_file(input: 'api.test.in',
                  output: 'api.test',
                  configuration: conf,
-                 install_dir: installed_test_datadir)
+                 install_dir: testdatadir)
 endif
-

diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
index ae9860839c695005ff4d00aa5e15beed1e1aa3a8..0ce567ebacc73680d6d6d9cb0a5f887afa6fe2c6 100644 (file)
--- a/testsuite/css/nodes/meson.build
+++ b/testsuite/css/nodes/meson.build
@@ -1,15 +1,15 @@
-test_env = environment()
-test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-test_env.set('GSETTINGS_BACKEND', 'memory')
-test_env.set('G_ENABLE_DIAGNOSTIC', '0')
+testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
+testdatadir = join_paths(installed_test_datadir, 'css')
 
 testexecdir = join_paths(installed_test_bindir, 'css', 'nodes')
 test_nodes = executable('test-css-nodes', 'test-css-nodes.c',
                         install: get_option('install-tests'),
                         install_dir: testexecdir,
                         dependencies: libgtk_dep)
-test('nodes', test_nodes, suite: 'css', env: test_env)
+test('nodes', test_nodes,
+     args: [ '--tap', '-k' ],
+     env: installed_test_env,
+     suite: 'css')
 
 test_data = [
   'box.ltr.nodes',
@@ -71,10 +71,10 @@ test_data = [
 if get_option('install-tests')
   conf = configuration_data()
   conf.set('libexecdir', gtk_libexecdir)
-  configure_file(input: 'test-css-nodes.test.in',
-                 output: 'test-css-nodes.test',
+  configure_file(input: 'nodes.test.in',
+                 output: 'nodes.test',
                  configuration: conf,
-                 install_dir: installed_test_datadir)
+                 install_dir: testdatadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/css/nodes/nodes.test.in b/testsuite/css/nodes/nodes.test.in
new file mode 100644 (file)
index 0000000..bf53319
--- /dev/null
+++ b/testsuite/css/nodes/nodes.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in
deleted file mode 100644 (file)
index 1687ba2..0000000
--- a/testsuite/css/nodes/test-css-nodes.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/nodes && @libexecdir@/installed-tests/gtk-4.0/css/nodes/test-css-nodes --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/css/parser/meson.build b/testsuite/css/parser/meson.build
index 2c36e153f88a44f7d5e5f13aaf96a54eabd96892..ac91b6c0c92e0a7867cb9f101554fae0c7759d7f 100644 (file)
--- a/testsuite/css/parser/meson.build
+++ b/testsuite/css/parser/meson.build
@@ -1,16 +1,14 @@
-test_env = environment()
-test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-test_env.set('GSETTINGS_BACKEND', 'memory')
-test_env.set('G_ENABLE_DIAGNOSTIC', '0')
-
 testexecdir = join_paths(installed_test_bindir, 'css', 'parser')
+testdatadir = join_paths(installed_test_datadir, 'css')
 
 test_parser = executable('test-css-parser', 'test-css-parser.c',
                          install: get_option('install-tests'),
                          install_dir: testexecdir,
                          dependencies: libgtk_dep)
-test('parser', test_parser, suite: 'css', env: test_env)
+test('parser', test_parser,
+     args: [ '--tap', '-k' ],
+     env: installed_test_env,
+     suite: 'css')
 
 test_data = [
   'animation-crash-3.12.css',
@@ -456,10 +454,10 @@ test_data = [
 if get_option('install-tests')
   conf = configuration_data()
   conf.set('libexecdir', gtk_libexecdir)
-  configure_file(input: 'test-css-parser.test.in',
-                 output: 'test-css-parser.test',
+  configure_file(input: 'parser.test.in',
+                 output: 'parser.test',
                  configuration: conf,
-                 install_dir: installed_test_datadir)
+                 install_dir: testdatadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/css/parser/parser.test.in b/testsuite/css/parser/parser.test.in
new file mode 100644 (file)
index 0000000..2312d73
--- /dev/null
+++ b/testsuite/css/parser/parser.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
deleted file mode 100644 (file)
index 9f36f2a..0000000
--- a/testsuite/css/parser/test-css-parser.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/parser && @libexecdir@/installed-tests/gtk-4.0/css/parser/test-css-parser --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build
index 79cd90a44af21662aab24a96d1226a838980e85b..5c84c02049e54c5cd5043bb5cef80ed86c4d9f2f 100644 (file)
--- a/testsuite/css/style/meson.build
+++ b/testsuite/css/style/meson.build
@@ -1,10 +1,5 @@
-test_env = environment()
-test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-test_env.set('GSETTINGS_BACKEND', 'memory')
-test_env.set('G_ENABLE_DIAGNOSTIC', '0')
-
 testexecdir = join_paths(installed_test_bindir, 'css', 'style')
+testdatadir = join_paths(installed_test_datadir, 'css')
 
 cssresources = gnome.compile_resources(
   'cssresources',
@@ -16,11 +11,14 @@ test_style = executable(
   'test-css-style',
   'test-css-style.c',
   cssresources,
+  dependencies: libgtk_dep,
   install: get_option('install-tests'),
   install_dir: testexecdir,
-  dependencies: libgtk_dep,
 )
-test('style', test_style, suite: 'css', env: test_env)
+test('style', test_style,
+     args: [ '--tap', '-k' ],
+     env: installed_test_env,
+     suite: 'css')
 
 test_data = [
   'adjacent-states.css',
@@ -53,12 +51,11 @@ test_data = [
 if get_option('install-tests')
   conf = configuration_data()
   conf.set('libexecdir', gtk_libexecdir)
-  configure_file(input: 'test-css-style.test.in',
-                 output: 'test-css-style.test',
+  configure_file(input: 'style.test.in',
+                 output: 'style.test',
                  configuration: conf,
-                 install_dir: installed_test_datadir)
+                 install_dir: testdatadir)
 
   install_data(test_data, install_dir: testexecdir)
 
 endif
-

diff --git a/testsuite/css/style/style.test.in b/testsuite/css/style/style.test.in
new file mode 100644 (file)
index 0000000..2990614
--- /dev/null
+++ b/testsuite/css/style/style.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in
deleted file mode 100644 (file)
index daeb364..0000000
--- a/testsuite/css/style/test-css-style.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/css/style && @libexecdir@/installed-tests/gtk-4.0/css/style/test-css-style --tap"
-Type=session
-Output=TAP

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index d430ca8cff09ebc5644c4748aefc6f7528f5f0c9..218439e65ce9bb559dfc1c45de2d29bb6f5280b2 100644 (file)
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -1,8 +1,13 @@
+testexecdir = join_paths(installed_test_bindir, 'gsk')
+testdatadir = join_paths(installed_test_datadir, 'gsk')
+
 test_render_nodes = executable(
   'test-render-nodes',
   ['test-render-nodes.c',
    'reftest-compare.c'],
   dependencies: libgtk_dep,
+  install: get_option('install-tests'),
+  install_dir: testexecdir
 )
 
 cairo_test_env = environment()
@@ -12,7 +17,10 @@ cairo_test_env.set('GSETTINGS_BACKEND', 'memory')
 cairo_test_env.set('G_ENABLE_DIAGNOSTIC', '0')
 cairo_test_env.set('GSK_RENDERER', 'cairo')
 
-test('nodes (cairo)', test_render_nodes, suite: 'gsk', env: cairo_test_env)
+test('nodes (cairo)', test_render_nodes,
+             args: [ '--tap', '-k' ],
+             env: cairo_test_env,
+             suite: 'gsk')
 
 vulkan_test_env = environment()
 vulkan_test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
@@ -21,7 +29,10 @@ vulkan_test_env.set('GSETTINGS_BACKEND', 'memory')
 vulkan_test_env.set('G_ENABLE_DIAGNOSTIC', '0')
 vulkan_test_env.set('GSK_RENDERER', 'vulkan')
 
-test('nodes (vulkan)', test_render_nodes, suite: 'gsk', env: vulkan_test_env)
+test('nodes (vulkan)', test_render_nodes,
+     args: [ '--tap', '-k' ],
+     env: vulkan_test_env,
+     suite: 'gsk')
 
 test_data = [
   'blendmode.node',
@@ -51,10 +62,10 @@ test_data = [
 if get_option('install-tests')
   conf = configuration_data()
   conf.set('libexecdir', gtk_libexecdir)
-  configure_file(input: 'test-render-nodes.test.in',
-                 output: 'test-render-nodes.test',
+  configure_file(input: 'render-nodes.test.in',
+                 output: 'render-nodes.test',
                  configuration: conf,
-                 install_dir: installed_test_datadir)
+                 install_dir: testdatadir)
 
   install_data(test_data, install_dir: testexecdir)
 

diff --git a/testsuite/gsk/render-nodes.test.in b/testsuite/gsk/render-nodes.test.in
new file mode 100644 (file)
index 0000000..01f2a50
--- /dev/null
+++ b/testsuite/gsk/render-nodes.test.in
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap -k
+Type=session
+Output=TAP

diff --git a/testsuite/gsk/test-render-nodes.test.in b/testsuite/gsk/test-render-nodes.test.in
deleted file mode 100644 (file)
index 4ea3baa..0000000
--- a/testsuite/gsk/test-render-nodes.test.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk-4.0/gsk && @libexecdir@/installed-tests/gtk-4.0/gsk/test-render-nodes --tap"
-Type=session
-Output=TAP